From 4f3dacc936c89408b983b0434b080152f13bce60 Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Mon, 21 Aug 2023 21:04:29 +0200 Subject: [PATCH] Cherry-pick patch from upstream to fix FTBFS with gcc-13. Closes: #1037887 --- debian/changelog | 8 +++++ debian/patches/10_matplotlib.patch | 8 ++--- debian/patches/110_vtk9_netcdf.patch | 6 ++-- debian/patches/120_fix_shader_crash.patch | 26 +++++++--------- .../20_do_not_link_against_socket.patch | 8 ++--- debian/patches/30_drop_medical_example.patch | 6 ++-- debian/patches/40_vtkpython-9.patch | 8 ++--- .../patches/50_fix_python-modules_path.patch | 16 ++++------ debian/patches/60_fix_path_perl.patch | 24 +++++++-------- debian/patches/83_allow_gles_platforms.patch | 11 ++----- ...tTexture_no_vtkOpenGLCheckErrorMacro.patch | 6 ++-- debian/patches/95_java_mach-arch_fix.patch | 13 +++----- debian/patches/97_reproducible_builds.patch | 12 ++------ debian/patches/98_fix_mpi4py.py | 6 ++-- debian/patches/99_fix_ftbfs.patch | 6 ++-- debian/patches/gcc-13.patch | 30 +++++++++++++++++++ debian/patches/series | 1 + 17 files changed, 102 insertions(+), 93 deletions(-) create mode 100644 debian/patches/gcc-13.patch diff --git a/debian/changelog b/debian/changelog index da56713a1..bfb958f18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vtk9 (9.1.0+really9.1.0+dfsg2-7) unstable; urgency=medium + + * Team upload. + * Cherry-pick patch from upstream to fix FTBFS with gcc-13. + (Closes: #1037887) + + -- Michael R. Crusoe Tue, 22 Aug 2023 00:27:20 +0200 + vtk9 (9.1.0+really9.1.0+dfsg2-6) unstable; urgency=medium * Team upload. diff --git a/debian/patches/10_matplotlib.patch b/debian/patches/10_matplotlib.patch index c7e78fb47..cbd08bab2 100644 --- a/debian/patches/10_matplotlib.patch +++ b/debian/patches/10_matplotlib.patch @@ -1,9 +1,7 @@ Description: _matplotlib -Index: VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -=================================================================== ---- VTK-9.1.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -+++ VTK-9.1.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h -@@ -197,6 +197,10 @@ private: +--- vtk9.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h ++++ vtk9/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h +@@ -197,6 +197,10 @@ * to implement IsAvailable. */ static Availability CheckMPLAvailability(); diff --git a/debian/patches/110_vtk9_netcdf.patch b/debian/patches/110_vtk9_netcdf.patch index 888225e2b..284f8ecec 100644 --- a/debian/patches/110_vtk9_netcdf.patch +++ b/debian/patches/110_vtk9_netcdf.patch @@ -3,9 +3,9 @@ Author: Anton Gladky Bug-Debian: https://bugs.debian.org/1012703 Last-Update: 2022-06-19 ---- vtk9-9.1.0+really9.1.0+dfsg2.orig/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c -+++ vtk9-9.1.0+really9.1.0+dfsg2/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c -@@ -1770,7 +1770,7 @@ void ex__compress_variable(int exoid, in +--- vtk9.orig/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c ++++ vtk9/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c +@@ -1770,7 +1770,7 @@ */ /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ diff --git a/debian/patches/120_fix_shader_crash.patch b/debian/patches/120_fix_shader_crash.patch index 69c3f6bb8..0b7a7720c 100644 --- a/debian/patches/120_fix_shader_crash.patch +++ b/debian/patches/120_fix_shader_crash.patch @@ -14,11 +14,9 @@ Date: Thu Feb 10 10:19:39 2022 +0100 Therefore, when no gradient opacity TF is given, no argument is expected and none is given. -diff --git a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx -index cdcec460ef..dfc65de04b 100644 ---- a/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx -+++ b/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx -@@ -2415,7 +2415,8 @@ void vtkOpenGLGPUVolumeRayCastMapper::ReplaceShaderCompute( +--- vtk9.orig/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx ++++ vtk9/Rendering/VolumeOpenGL2/vtkOpenGLGPUVolumeRayCastMapper.cxx +@@ -2415,7 +2415,8 @@ vtkvolume::ComputeGradientOpacityMulti1DDecl(this->AssembledInputs)); vtkShaderProgram::Substitute(fragmentShader, "//VTK::ComputeColor::Dec", @@ -28,7 +26,7 @@ index cdcec460ef..dfc65de04b 100644 vtkShaderProgram::Substitute(fragmentShader, "//VTK::ComputeLighting::Dec", vtkvolume::ComputeLightingMultiDeclaration(ren, this, vol, numComps, independentComponents, -@@ -2970,6 +2971,23 @@ bool vtkOpenGLGPUVolumeRayCastMapper::vtkInternal::UpdateInputs(vtkRenderer* ren +@@ -2970,6 +2971,23 @@ this->ForceTransferInit(); } @@ -52,7 +50,7 @@ index cdcec460ef..dfc65de04b 100644 return success; } -@@ -3106,7 +3124,10 @@ void vtkOpenGLGPUVolumeRayCastMapper::GPURender(vtkRenderer* ren, vtkVolume* vol +@@ -3106,7 +3124,10 @@ this->Impl->MultiVolume = multiVol && this->GetInputCount() > 1 ? multiVol : nullptr; this->Impl->ClearRemovedInputs(renWin); @@ -64,11 +62,9 @@ index cdcec460ef..dfc65de04b 100644 this->Impl->UpdateSamplingDistance(ren); this->Impl->UpdateTransfer2DYAxisArray(ren, vol); this->Impl->UpdateTransferFunctions(ren); -diff --git a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h -index 766f36ab63..3406bfb431 100644 ---- a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h -+++ b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h -@@ -1054,10 +1054,24 @@ std::string ComputeLightingMultiDeclaration(vtkRenderer* vtkNotUsed(ren), vtkVol +--- vtk9.orig/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h ++++ vtk9/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h +@@ -1054,10 +1054,24 @@ int lightingComplexity) { vtkVolumeProperty* volProperty = vol->GetProperty(); @@ -94,7 +90,7 @@ index 766f36ab63..3406bfb431 100644 // Shading for composite blending only int const shadeReqd = volProperty->GetShade() && -@@ -1243,7 +1257,8 @@ std::string ComputeColorDeclaration(vtkRenderer* vtkNotUsed(ren), +@@ -1243,7 +1257,8 @@ } //-------------------------------------------------------------------------- @@ -104,7 +100,7 @@ index 766f36ab63..3406bfb431 100644 { std::ostringstream ss; int i = 0; -@@ -1274,13 +1289,28 @@ std::string ComputeColorMultiDeclaration(vtkOpenGLGPUVolumeRayCastMapper::Volume +@@ -1274,13 +1289,28 @@ } else { @@ -140,7 +136,7 @@ index 766f36ab63..3406bfb431 100644 } return ss.str(); -@@ -1828,14 +1858,18 @@ std::string ShadingMultipleInputs( +@@ -1828,14 +1858,18 @@ if (property->GetTransferFunctionMode() == vtkVolumeProperty::TF_1D) { diff --git a/debian/patches/20_do_not_link_against_socket.patch b/debian/patches/20_do_not_link_against_socket.patch index 8b4e89f98..1f97a9ec9 100644 --- a/debian/patches/20_do_not_link_against_socket.patch +++ b/debian/patches/20_do_not_link_against_socket.patch @@ -1,10 +1,8 @@ Description: Do not try linking with -lsocket -Index: VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake -=================================================================== ---- VTK-9.0.1.orig/Common/System/vtkTestSocketFeatures.cmake -+++ VTK-9.0.1/Common/System/vtkTestSocketFeatures.cmake -@@ -6,9 +6,6 @@ check_library_exists("socket" getsocknam +--- vtk9.orig/Common/System/vtkTestSocketFeatures.cmake ++++ vtk9/Common/System/vtkTestSocketFeatures.cmake +@@ -6,9 +6,6 @@ if(NOT DEFINED VTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T) set(VTK_GETSOCKNAME_LIBS) diff --git a/debian/patches/30_drop_medical_example.patch b/debian/patches/30_drop_medical_example.patch index 3b2a8871c..ae66a5691 100644 --- a/debian/patches/30_drop_medical_example.patch +++ b/debian/patches/30_drop_medical_example.patch @@ -1,9 +1,9 @@ Description: Drop medical examples Last-Update: 2020-10-21 ---- vtk9-9.0.1+dfsg1.orig/Examples/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Examples/CMakeLists.txt -@@ -55,7 +55,7 @@ else () +--- vtk9.orig/Examples/CMakeLists.txt ++++ vtk9/Examples/CMakeLists.txt +@@ -56,7 +56,7 @@ add_example(IO/Cxx) add_example(ImageProcessing/Cxx) add_example(Infovis/Cxx) diff --git a/debian/patches/40_vtkpython-9.patch b/debian/patches/40_vtkpython-9.patch index 68a950c46..6d1773f90 100644 --- a/debian/patches/40_vtkpython-9.patch +++ b/debian/patches/40_vtkpython-9.patch @@ -2,11 +2,9 @@ Description: Rename vtkpython to vtkpython-9.0 Author: Anton Gladky Last-Update: 2020-11-05 -Index: vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt -=================================================================== ---- vtk9-9.0.1+dfsg1.orig/Wrapping/Python/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Wrapping/Python/CMakeLists.txt -@@ -23,21 +23,21 @@ endif () +--- vtk9.orig/Wrapping/Python/CMakeLists.txt ++++ vtk9/Wrapping/Python/CMakeLists.txt +@@ -23,21 +23,21 @@ # The interpreters are not supported in wheel builds, so skip them. if (NOT VTK_WHEEL_BUILD) diff --git a/debian/patches/50_fix_python-modules_path.patch b/debian/patches/50_fix_python-modules_path.patch index 61e6fc98c..338bcc87d 100644 --- a/debian/patches/50_fix_python-modules_path.patch +++ b/debian/patches/50_fix_python-modules_path.patch @@ -2,11 +2,9 @@ Description: Fix path for the installation of python modules Author: Anton Gladky Last-Update: 2020-11-06 -Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake -=================================================================== ---- vtk9-9.0.1+dfsg1.orig/CMake/vtkModuleWrapPython.cmake -+++ vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake -@@ -84,7 +84,7 @@ function (vtk_module_python_default_dest +--- vtk9.orig/CMake/vtkModuleWrapPython.cmake ++++ vtk9/CMake/vtkModuleWrapPython.cmake +@@ -87,7 +87,7 @@ "for Python modules.") set(_vtk_python_version_suffix) endif () @@ -15,11 +13,9 @@ Index: vtk9-9.0.1+dfsg1/CMake/vtkModuleWrapPython.cmake endif () set("${var}" "${destination}" PARENT_SCOPE) -Index: vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt -=================================================================== ---- vtk9-9.0.1+dfsg1.orig/Utilities/Python/CMakeLists.txt -+++ vtk9-9.0.1+dfsg1/Utilities/Python/CMakeLists.txt -@@ -77,7 +77,7 @@ if (NOT VTK_PYTHON_SITE_PACKAGES_SUFFIX) +--- vtk9.orig/Utilities/Python/CMakeLists.txt ++++ vtk9/Utilities/Python/CMakeLists.txt +@@ -85,7 +85,7 @@ set(VTK_PYTHON_SITE_PACKAGES_SUFFIX "Lib/site-packages") else () set(VTK_PYTHON_SITE_PACKAGES_SUFFIX diff --git a/debian/patches/60_fix_path_perl.patch b/debian/patches/60_fix_path_perl.patch index cd69a5dbc..d97422ba1 100644 --- a/debian/patches/60_fix_path_perl.patch +++ b/debian/patches/60_fix_path_perl.patch @@ -2,48 +2,48 @@ Description: Fix shebang for the perl scripts Author: Anton Gladky Last-Update: 2020-11-08 ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_class2example.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_class2example.pl +--- vtk9.orig/Utilities/Doxygen/doc_class2example.pl ++++ vtk9/Utilities/Doxygen/doc_class2example.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2004-06-09 11:12:38 barre> # # Build cross-references between classes and examples ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_cleanhtml.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_cleanhtml.pl +--- vtk9.orig/Utilities/Doxygen/doc_cleanhtml.pl ++++ vtk9/Utilities/Doxygen/doc_cleanhtml.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2002-10-25 20:17:59 barre> # # Clean the HTML generated by Doxygen to remove some layout quicks ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_codematch.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_codematch.pl +--- vtk9.orig/Utilities/Doxygen/doc_codematch.pl ++++ vtk9/Utilities/Doxygen/doc_codematch.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2002-01-18 16:17:26 barre> # # Summary ? ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_index.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_index.pl +--- vtk9.orig/Utilities/Doxygen/doc_index.pl ++++ vtk9/Utilities/Doxygen/doc_index.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2001-11-21 17:40:48 barre> # # Build full-text index ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_rmpath.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_rmpath.pl +--- vtk9.orig/Utilities/Doxygen/doc_rmpath.pl ++++ vtk9/Utilities/Doxygen/doc_rmpath.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # Time-stamp: <2001-10-05 11:49:40 barre> # # Remove path to intermediate Doxygen dir from html doc ---- vtk9-9.0.1+dfsg1.orig/Utilities/Doxygen/doc_version.pl -+++ vtk9-9.0.1+dfsg1/Utilities/Doxygen/doc_version.pl +--- vtk9.orig/Utilities/Doxygen/doc_version.pl ++++ vtk9/Utilities/Doxygen/doc_version.pl @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl diff --git a/debian/patches/83_allow_gles_platforms.patch b/debian/patches/83_allow_gles_platforms.patch index e08f7a41d..5f224075f 100644 --- a/debian/patches/83_allow_gles_platforms.patch +++ b/debian/patches/83_allow_gles_platforms.patch @@ -8,11 +8,9 @@ Date: Fri, 11 Dec 2020 10:42:37 +0200 GUISupport/Qt/QVTKOpenGLWindow.cxx | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/GUISupport/Qt/QVTKOpenGLWindow.cxx b/GUISupport/Qt/QVTKOpenGLWindow.cxx -index 3bddc19809..79d5c2b653 100644 ---- a/GUISupport/Qt/QVTKOpenGLWindow.cxx -+++ b/GUISupport/Qt/QVTKOpenGLWindow.cxx -@@ -35,6 +35,11 @@ +--- vtk9.orig/GUISupport/Qt/QVTKOpenGLWindow.cxx ++++ vtk9/GUISupport/Qt/QVTKOpenGLWindow.cxx +@@ -34,6 +34,11 @@ #include "vtkObjectFactory.h" #include "vtkOpenGLState.h" @@ -24,6 +22,3 @@ index 3bddc19809..79d5c2b653 100644 QVTKOpenGLWindow::QVTKOpenGLWindow(QOpenGLWindow::UpdateBehavior ub, QWindow* p) : QVTKOpenGLWindow(vtkSmartPointer::New(), nullptr, ub, p) { --- -2.20.1 - diff --git a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch index 0744d41ee..8a7c63d08 100644 --- a/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch +++ b/debian/patches/84_vtkQWidgetTexture_no_vtkOpenGLCheckErrorMacro.patch @@ -2,8 +2,8 @@ Description: HACK: vtkQWidgetTexture.cxx: Don't use vtkOpenGLCheckErrorMacro Fixes building for Qt with OpenGL ES. Author: Adrian Bunk ---- vtk9-9.1.0+dfsg2.orig/GUISupport/Qt/vtkQWidgetTexture.cxx -+++ vtk9-9.1.0+dfsg2/GUISupport/Qt/vtkQWidgetTexture.cxx +--- vtk9.orig/GUISupport/Qt/vtkQWidgetTexture.cxx ++++ vtk9/GUISupport/Qt/vtkQWidgetTexture.cxx @@ -18,7 +18,7 @@ #include "vtkOpenGLResourceFreeCallback.h" #include "vtkOpenGLState.h" @@ -13,7 +13,7 @@ Author: Adrian Bunk #include #include -@@ -98,7 +98,7 @@ vtkQWidgetTexture::vtkQWidgetTexture() +@@ -98,7 +98,7 @@ } this->Create2DFromRaw(width, height, 4, VTK_UNSIGNED_CHAR, this->ImageBuffer); diff --git a/debian/patches/95_java_mach-arch_fix.patch b/debian/patches/95_java_mach-arch_fix.patch index a30212502..c73d36cc1 100644 --- a/debian/patches/95_java_mach-arch_fix.patch +++ b/debian/patches/95_java_mach-arch_fix.patch @@ -9,11 +9,9 @@ Subject: [PATCH] Fix build on mach-based OS which are not OS X include/diy/time.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -index 692cf36..671e69d 100644 ---- a/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -+++ b/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp -@@ -3,11 +3,11 @@ +--- vtk9.orig/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp ++++ vtk9/ThirdParty/diy2/vtkdiy2/include/vtkdiy2/time.hpp +@@ -3,10 +3,10 @@ #ifndef _WIN32 #include @@ -26,8 +24,7 @@ index 692cf36..671e69d 100644 #endif // ifndef _WIN32 namespace diy - { -@@ -16,7 +16,7 @@ typedef unsigned long time_type; +@@ -16,7 +16,7 @@ inline time_type get_time() { @@ -36,5 +33,3 @@ index 692cf36..671e69d 100644 clock_serv_t cclock; mach_timespec_t ts; host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); --- -GitLab diff --git a/debian/patches/97_reproducible_builds.patch b/debian/patches/97_reproducible_builds.patch index 46c71684b..8081e7861 100644 --- a/debian/patches/97_reproducible_builds.patch +++ b/debian/patches/97_reproducible_builds.patch @@ -8,11 +8,9 @@ Thanks to Bernhard M. Wiedemann . Utilities/Doxygen/doc_class2example.pl | 1 + 1 file changed, 1 insertion(+) -diff --git a/Utilities/Doxygen/doc_class2example.pl b/Utilities/Doxygen/doc_class2example.pl -index 3978563..ce8aeca 100755 ---- a/Utilities/Doxygen/doc_class2example.pl -+++ b/Utilities/Doxygen/doc_class2example.pl -@@ -261,6 +261,7 @@ if (exists $args{"parser"}) { +--- vtk9.orig/Utilities/Doxygen/doc_class2example.pl ++++ vtk9/Utilities/Doxygen/doc_class2example.pl +@@ -261,6 +261,7 @@ } else { @parsers = keys %parsers; } @@ -20,7 +18,3 @@ index 3978563..ce8aeca 100755 my $os_is_win = ($^O =~ m/(MSWin32|Cygwin)/i); my $open_file_as_text = $os_is_win ? O_TEXT : 0; --- -2.29.2 - - diff --git a/debian/patches/98_fix_mpi4py.py b/debian/patches/98_fix_mpi4py.py index fefb4211d..e61796e6a 100644 --- a/debian/patches/98_fix_mpi4py.py +++ b/debian/patches/98_fix_mpi4py.py @@ -2,9 +2,9 @@ Description: Fix mpi4py search Author: Anton Gladky Last-Update: 2021-09-17 ---- vtk9-9.0.3+dfsg1.orig/Parallel/MPI4Py/vtk.module -+++ vtk9-9.0.3+dfsg1/Parallel/MPI4Py/vtk.module -@@ -12,4 +12,3 @@ DEPENDS +--- vtk9.orig/Parallel/MPI4Py/vtk.module ++++ vtk9/Parallel/MPI4Py/vtk.module +@@ -12,4 +12,3 @@ PRIVATE_DEPENDS VTK::ParallelMPI VTK::mpi diff --git a/debian/patches/99_fix_ftbfs.patch b/debian/patches/99_fix_ftbfs.patch index 630b3ced1..1c4edeb14 100644 --- a/debian/patches/99_fix_ftbfs.patch +++ b/debian/patches/99_fix_ftbfs.patch @@ -2,9 +2,9 @@ Description: Fix FTBFS Author: Anton Gladky Last-Update: 2021-11-14 ---- vtk9-9.1.0+dfsg1.orig/CMake/vtkCompilerExtraFlags.cmake -+++ vtk9-9.1.0+dfsg1/CMake/vtkCompilerExtraFlags.cmake -@@ -3,7 +3,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) +--- vtk9.orig/CMake/vtkCompilerExtraFlags.cmake ++++ vtk9/CMake/vtkCompilerExtraFlags.cmake +@@ -3,7 +3,7 @@ include(CheckCXXCompilerFlag) # Additional warnings for GCC diff --git a/debian/patches/gcc-13.patch b/debian/patches/gcc-13.patch new file mode 100644 index 000000000..e5261b6fb --- /dev/null +++ b/debian/patches/gcc-13.patch @@ -0,0 +1,30 @@ +From 1233ceec268d5366c66f5e79786ec784042b591b Mon Sep 17 00:00:00 2001 +From: Laurent Rineau +Date: Tue, 17 Jan 2023 16:18:53 +0100 +Subject: Add #include to compile with gcc13 +Origin: upstream, https://gitlab.kitware.com/vtk/vtk/-/commit/1233ceec268d5366c66f5e79786ec784042b591b + +The `vtkSEPReader` was introduced by MRs !4909 (from my former +collaborator Maxime) and !4938. Then it was highly modified by +!7516. The later MR is the one that introduced the uses of +`std::uint8_t` and `std::uint32_t`. + +Those types needs the inclusion of ``. +--- + IO/Image/vtkSEPReader.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- vtk9.orig/IO/Image/vtkSEPReader.h ++++ vtk9/IO/Image/vtkSEPReader.h +@@ -25,8 +25,9 @@ + #include "vtkImageAlgorithm.h" + #include "vtkNew.h" // for ivars + +-#include // for std::array +-#include // for std::string ++#include // for std::array ++#include // for std::uint8_t and std::uint32_t ++#include // for std::string + + namespace details + { diff --git a/debian/patches/series b/debian/patches/series index 1efd5d331..591aab3da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +gcc-13.patch 10_matplotlib.patch 20_do_not_link_against_socket.patch 30_drop_medical_example.patch -- 2.30.2